Delete-button working, layout needs work