Cleaned up layout and execution order, simplified a lot of things