version 2 updates to ui and objecting out classes