A few style tweaks so its not so ugly