#11 partial fixes - need to add index and menu stuff