Support for Android Lolipop

Also new layout for main activity