Fix activity bug and improve design