Bug fixed: Links do not work
Cleanup. Add methods to be used in the future.