Add padding to item inventory screen, refactor a few variables