Added icon, refactored setup for window