Work on bjr theme and layout