More work & fixing, add needed icons