changed to dashboard style app layout
Fixed queries and layout