Some more changes to look and feel