Bugfix and layout modify