stability and layout fixes