Group things that didn't seem to need to be separate in the construction menu.
Make everything caps for consistency. Grammar police might be sad.