WIP on styles and moved Edit button to nav bar