Slight changes on the layout
WIP integrating motion into the UI