Layout changes and UI updates and starting to add quick start