Implemented a new layout list item and cleaned up code