Change naming, edit border radius