Fix some design issue and make it look lite better as well