Removed old containers, added new, added buttons

Previously used lists where there should have been tables