"Cleaning" up the views a little, still a mess