Adding final fixes and layout changes