Increased list functionality and reformatted

Still need to fix remove buttons