fixed overwriting admin
fixed picture layout on calendar