Some more changes to the look & feel