UI Changes

Reworking Main UI Form