Changed code to make app have more native feel