Updated themes and Layout of MainActivity