Bug ZK-2449: upload button affects button layout flow