fixed syntax
Fixed some layout and other minor stuff