state fixes, added no capsules layout