UI draftly done.
Done some clean up.