Restructured layout to be more logical and use less resources