WIP small visual changes, file renaming