Fixed layout and added Instrumentation in Manifest