Main activity fixed