Layout fixes, Completely moved under android studio and gradle