update 4.24.14 16:42

Fixed UI bugs and made it look smoother. Added some TODO as well