fixed bugs in bigger case
fixed layout