Refactored layouts and changed IDs to be more consistent