Removed most template stuff, added sortable