Better handling of one-button view