Fixing layouts and adjusting color scheme