Fixed the layouts and added themes.