Bug fixes and some more GUI