Added epub viewer
More refactoring and cleanup