Refactored Class layout and styles