Some minor addition

Need to create issue and wrap things like these pages into classes