Final App with tweaks