Some frontend scaling issues
Frontend fixes