Lots of layout changes and fixed some bugs