small gui changes
fixing merge