beautification
clean up
partly upper button fix
Revert "partly upper button fix"

This reverts commit dc054da1f035f023f1b600a995dbdd583d7a5da0.