#43 Add remaining parts for settings