lot of fixes to look and feel