Remove 'Marginal' and improve mode button position