Move templates to separate folders based on responsiblity, add modal window, profile image for logged in users