Cleaned up some tables and re-arranged search box. Still not perfect though...