Check in refactoring of list and view devices to include JSPs