Working on my apps layout mostly