add app layout and fix problems table/form