Fixed REST issue and some styling changes