Added to todo
Layout overhaul