Added a brick view and some other bug fixes