Refined Collision and UI made pretty
finishing up