Bug Fixing

General bug fixing and code tidy. Extra validation on Level page
rgarding number of items