use layer control rather than manual buttons
cleanup