Slight layout tweaks, and added Colors