Improving Design + Adding big Add-Button #198