Refactored GUI methods