Fixes and layout ready