Initial code-commit, removes various buttons