Added two-layer rendering and some button improvements.