Changes to get the complete UI look and feel. Still need to finish the
machine settings area.