added Color view and Square layouts