Finished the layout changes and implemented internal improvements in the UI