Update layout and stles, fix issues