Made the main layout not terrible. Still needs to be finalized.