Button intermediary commit

Added buttons but still use starling instances