Few gui tweaks, got rid of the warnings