Image preview fix, layout fix