bugfixed, text commits, layout, functions