Added better scrollview layout