fixed bugs, change layouts