New Commmit

Fixed UI