Layout fixes, logout fix, colors fixes