Fixed various front end shit