Layout fixes, some new methods