main layout changed

download button moved to toolbar
code for layouts reorganized in separate files