Bug ZK-2449: upload button affects button layout flow
Merge pull request #131 from hanhsu/B65-ZK-2449

Bug ZK-2449: upload button affects button layout flow