Refactored some gmail pages