gui work
fixing merge issues