Small layout changes. Fixed client and company info not being updated.