Movement to Activities

Yeah it seemed like a good idea but this will handle much better as it
is Android convention