intermediat commit
merging
slight css changes