diff --git a/src/main/webapp/app/search/searchForm.zul b/src/main/webapp/app/search/searchForm.zul
index 7afb6c31..bbeacd0c 100644
--- a/src/main/webapp/app/search/searchForm.zul
+++ b/src/main/webapp/app/search/searchForm.zul
@@ -18,7 +18,7 @@
                     <vbox>
                         <image src="/img/lucene_logo.png"/>
                         <hbox>
-                            <textbox value="@bind(vm.keyWord)" instant="true" width="250px"
+                            <textbox value="@bind(vm.keyWord)" instant="true" width="250px" onCreate="self.setFocus(true)"
                                      onOK="@command('doSearch')"/>
                             <button label="${labels.Search}" onClick="@command('doSearch')" sclass="nicebutton"
                                     image="/img/search.png"/>
diff --git a/src/main/webapp/main/invoicing/invoicingForm.zul b/src/main/webapp/main/invoicing/invoicingForm.zul
index c5e8c1b8..a516a260 100644
--- a/src/main/webapp/main/invoicing/invoicingForm.zul
+++ b/src/main/webapp/main/invoicing/invoicingForm.zul
@@ -1,4 +1,4 @@
-<?page title="${labels.Invoicing}" contentType="text/html;charset=UTF-8"?>
+<?page contentType="text/html;charset=UTF-8"?>
 <zk>
 	<window
 		id="editWin"
@@ -14,122 +14,122 @@
 			zclass="form-caption"
 			label="${labels.InvoicingFormTitle}" />
 		<vlayout vflex="1">
-			<hbox>
-			
-			<vbox height="300px">
+			<hbox
+				vflex="min"
+				hflex="1">
 				<button
-					image="/img/item-add.png" 
-					label="${labels.InvoicingAdd}" 
+					image="/img/item-add.png"
+					label="${labels.InvoicingAdd}"
 					sclass="nicebutton"
-					onClick="@command('addItem')"/>
-				
-				<listbox 
-					model="@load(vm.dataBean.items)" 
-					vflex="1"
-					selectedItem="@bind(vm.selectedItem)"
-					selectedIndex="@bind(vm.selectedIndex)">
-					<listhead>
-						<listheader 
-							label="${labels.InvoicingDate}" 
-							width="150px"/>
-						<listheader label="${labels.InvoicingInvoiceNumber}" />
-						<listheader 
-							label="${labels.InvoicingAmount}"
-							align="right" 
-							width="90px"/>
-						<listheader/>
-					</listhead>
-					<template name="model">
-						<listitem>
-							<listcell>
-								<datebox 
-									value="@bind(each.invoiceDate)" 
-									inplace="true"
-									onFocus="@command('onFocus', item=each)"/>
-							</listcell>
-							<listcell>
-								<textbox 
-									value="@bind(each.invoiceNumber)" 
-									sclass="grid-textbox-max" 
-									inplace="true"
+					onClick="@command('addItem')" />
+			</hbox>
+			<hbox vflex="1">
+				<vbox vflex="1">
+					<listbox
+						model="@load(vm.dataBean.items)"
+						vflex="1"
+						selectedItem="@bind(vm.selectedItem)"
+						selectedIndex="@bind(vm.selectedIndex)">
+						<listhead>
+							<listheader
+								label="${labels.InvoicingDate}"
+								width="150px" />
+							<listheader label="${labels.InvoicingInvoiceNumber}" />
+							<listheader
+								label="${labels.InvoicingAmount}"
+								align="right"
+								width="90px" />
+							<listheader />
+						</listhead>
+						<template name="model">
+							<listitem>
+								<listcell>
+									<datebox
+										value="@bind(each.invoiceDate)"
+										inplace="true"
+										onFocus="@command('onFocus', item=each)" />
+								</listcell>
+								<listcell>
+									<textbox
+										value="@bind(each.invoiceNumber)"
+										sclass="grid-textbox-max"
+										inplace="true"
+										maxlength="@load(vm.lengthText)"
+										onFocus="@command('onFocus', item=each)" />
+								</listcell>
+								<listcell>
+									<textbox
+										value="@bind(each.amount) @converter(vm.standardBigDecimalConverter)"
+										sclass="grid-textbox-max"
+										inplace="true"
+										onFocus="@command('onFocus', item=each)"
+										maxlength="@load(vm.lengthText)"
+										onChange="@command('calculate')" />
+								</listcell>
+								<listcell>
+									<button
+										label="${labels.RemoveItem}"
+										sclass="nicebutton"
+										onClick="@command('removeItem', item=each)" />
+								</listcell>
+							</listitem>
+						</template>
+					</listbox>
+				</vbox>
+				<grid hflex="min">
+					<columns>
+						<column
+							align="right"
+							hflex="min" />
+						<column />
+					</columns>
+					<rows>
+						<row>
+							<cell sclass="row-title">${labels.InvoicingRequirementNumber} :</cell>
+							<cell>
+								<textbox
+									width="200px"
+									value="@bind(vm.dataBean.requirement.numser)"
+									style="font-weight: bold;"
 									maxlength="@load(vm.lengthText)"
-									onFocus="@command('onFocus', item=each)"/>
-							</listcell>
-							<listcell>
-								<textbox 
-									value="@bind(each.amount) @converter(vm.standardBigDecimalConverter)" 
-									sclass="grid-textbox-max" 
-									inplace="true"
-									onFocus="@command('onFocus', item=each)"
+									readonly="true" />
+							</cell>
+						</row>
+						<row>
+							<cell sclass="row-title">${labels.InvoicingDescription} :</cell>
+							<cell>
+								<textbox
+									width="350px"
+									rows="5"
+									value="@bind(vm.dataBean.requirement.description)"
+									maxlength="@load(vm.lengthDescription)"
+									readonly="true" />
+							</cell>
+						</row>
+						<row>
+							<cell sclass="row-title">${labels.InvoicingRequirementPrice} :</cell>
+							<cell>
+								<textbox
+									width="150px"
+									value="@bind(vm.dataBean.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)"
 									maxlength="@load(vm.lengthText)"
-									onChange="@command('calculate')"/>
-							</listcell>
-							<listcell>
-								<button label="${labels.RemoveItem}" sclass="nicebutton" onClick="@command('removeItem', item=each)"/>
-							</listcell>
-						</listitem>
-					</template>
-				</listbox>
-			</vbox>
-			
-			<grid hflex="min">
-				<columns>
-					<column
-						align="right"
-						hflex="min" />
-					<column />
-				</columns>
-				<rows>
-					<row>
-						<cell sclass="row-title">${labels.InvoicingRequirementNumber} :</cell>
-						<cell>
-							<textbox
-								width="200px"
-								value="@bind(vm.dataBean.requirement.numser)"
-								style="font-weight: bold;" 
-								maxlength="@load(vm.lengthText)"
-								readonly="true"/>
-						</cell>
-					</row>
-					<row>
-						<cell sclass="row-title">${labels.InvoicingDescription} :</cell>
-						<cell>
-							<textbox
-								width="350px"
-								rows="5"
-								value="@bind(vm.dataBean.requirement.description)"
-								maxlength="@load(vm.lengthDescription)"
-								readonly="true" />
-						</cell>
-					</row>
-					<row>
-						<cell sclass="row-title">${labels.InvoicingRequirementPrice} :</cell>
-						<cell>
-							<textbox
-								width="150px"
-								value="@bind(vm.dataBean.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)"
-								maxlength="@load(vm.lengthText)" 
-								readonly="true"/>
-						</cell>
-					</row>
-					<row>
-						<cell sclass="row-title">${labels.InvoicingInvoicedPrice} :</cell>
-						<cell>
-							<textbox
-								width="150px"
-								value="@bind(vm.dataBean.totalInvoiced) @converter(vm.standardBigDecimalConverter)" 
-								readonly="true"
-								maxlength="@load(vm.lengthText)"
-								style="@load(vm.dataBean.totalInvoiced gt vm.dataBean.requirement.sumTotal ? ' color: red;' : '' )"/>
-						</cell>
-					</row>
-				</rows>
-			</grid>
-			
-			
-			
+									readonly="true" />
+							</cell>
+						</row>
+						<row>
+							<cell sclass="row-title">${labels.InvoicingInvoicedPrice} :</cell>
+							<cell>
+								<textbox
+									width="150px"
+									value="@bind(vm.dataBean.totalInvoiced) @converter(vm.standardBigDecimalConverter)"
+									readonly="true"
+									maxlength="@load(vm.lengthText)"
+									style="@load(vm.dataBean.totalInvoiced gt vm.dataBean.requirement.sumTotal ? ' color: red;' : '' )" />
+							</cell>
+						</row>
+					</rows>
+				</grid>
 			</hbox>
-			
 			<listbox
 				vflex="1"
 				model="@load(vm.dataBean.requirement.items)">
@@ -169,7 +169,7 @@
 				<template name="model">
 					<listitem>
 						<listcell>
-							<label value="@load(each.code)"/>
+							<label value="@load(each.code)" />
 						</listcell>
 						<listcell>
 							<label value="@load(each.name)" />
@@ -190,7 +190,7 @@
 							<label value="@bind(each.total) @converter(vm.standardBigDecimalConverter)" />
 						</listcell>
 						<listcell>
-							<checkbox checked="@bind(each.paid)"/>
+							<checkbox checked="@bind(each.paid)" />
 						</listcell>
 						<listcell>
 							<label value="@bind(each.description)" />
@@ -198,7 +198,6 @@
 					</listitem>
 				</template>
 			</listbox>
-			
 			<include src="/app/formButtons.zul" />
 		</vlayout>
 	</window>