updated

fixed bugs and layout