working on changing ui (DO NOT MERGE)