fixed couple of layout issues
 merged changes
final merge