Tweaked padding
Utilize system snippets
Added ability to specify class for map