Gotham skin adjustments
label positioning changes due to PR:3451
whitespaces cleanup
Merge branch 'Gotham' of https://github.com/junkyhlm/skin.cirrus.extended.v3