Added layout changes and lots of functionality...