Fix #25 and layout of upload activity