Some changes in window layout