Refactored GUI components
Only GUI stuff in components