Cleaned up some layouts and text