Activity app: margin and position fixes