Some nicer changes to overall look