Updated the markup and synced with last commit