fixed N+1 queries and starting to style with bootstrap and flat UI