more stuff in blocks and new layout