UI Style changes, Code optimizes