Layout changes and some js edits