Layout is now better + minor fixes