Fixed layout to portrait and some other issues