Fixing final bugs and flaws - frontend dev still to be finished