fixing layout and intellij warnings