Fixing Layout and adding Color