Bug fixes and started work on offline gui