Modified layout for per item entries, need to test with device