MainActivity fix problems