Debugging update processing
Tweaking layout