Design changes, working on fixing resizing