Fixed some interactions
Almost Completed UI