Refactoring bonzana
UI back to normal
Moved all fragments to own package