added color and testing layout