Unnecessary changes in layouts has been reverted.