Implementing cover page - work in progress
Small fixes and code cleanup