Changed look and feel and some other tweaks