Misc. layout changes, much prettier now.