Some changes with layout and search