fixed folder structure due to changes on server, and fixed further some usability issues