Compact layout and better error handling