renamed some files to match app design
more tweaks