Merge pull request #100 from Useful-Innovation/johans-fixes

edit page hotfix column alignment
Merge pull request #101 from Useful-Innovation/johans-fixes

added time on index and moved button on edit