Layout cleanup and theme.