Full app commited with some design improvements missing.