Preparing to add core function buttons