Re-arranged buttons to stop appearing over tabs