Better GUI Look, but still Testing