Updated to cleaner layout