Fixed scrolling and layout bugs