Main view collection loading fixed. Finalizing dev on client side.
minor changes