Delete-button working, layout needs work
successfully merged