Cleaned up with and made it with gridlayout