Fixed main activity issue