Working more on UI / layout.