Work on Manage section, still mochup stuff