Further improves gui layout