A bit more layout styling. Still needs work.