bugfix and layout adjusts