Changed to more dynamic layout of start-view