Fixes to method calls and layout;